statusbar: Don't use a frame

This frame serves no purpose anymore, and now that frames
draw frames, it shows up annoyingly.

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 8484ce0d871e2a22afc21fd753fc2baa3cbbca01..2373843cef05fe58334cdf51838500d153507e4f 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -29,7 +29,6 @@
 #include "gtkstatusbarprivate.h"
 
 #include "gtkbinlayout.h"
-#include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
@@ -87,7 +86,6 @@ struct _GtkStatusbar
 {
   GtkWidget parent_instance;
 
-  GtkWidget     *frame;
   GtkWidget     *label;
   GtkWidget     *message_area;
 
@@ -138,7 +136,7 @@ gtk_statusbar_dispose (GObject *object)
 {
   GtkStatusbar *self = GTK_STATUSBAR (object);
 
-  g_clear_pointer (&self->frame, gtk_widget_unparent);
+  g_clear_pointer (&self->message_area, gtk_widget_unparent);
 
   G_OBJECT_CLASS (gtk_statusbar_parent_class)->dispose (object);
 }
@@ -200,7 +198,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
    */
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkstatusbar.ui");
   gtk_widget_class_bind_template_child_internal (widget_class, GtkStatusbar, message_area);
-  gtk_widget_class_bind_template_child (widget_class, GtkStatusbar, frame);
   gtk_widget_class_bind_template_child (widget_class, GtkStatusbar, label);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);

diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index c5a6ae4f0bdedc864b58c9d1b8cfff58836570b5..86a8148d3c2498c643e5eab04328b58cc51c3eae 100644 (file)
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -2,22 +2,17 @@
 <interface domain="gtk40">
   <template class="GtkStatusbar" parent="GtkWidget">
     <child>
-      <object class="GtkFrame" id="frame">
+      <object class="GtkBox" id="message_area">
         <property name="hexpand">1</property>
+        <property name="spacing">4</property>
         <child>
-          <object class="GtkBox" id="message_area">
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkLabel" id="label">
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="ellipsize">end</property>
-                <property name="single-line-mode">1</property>
-              </object>
-            </child>
+          <object class="GtkLabel" id="label">
+            <property name="halign">start</property>
+            <property name="valign">center</property>
+            <property name="ellipsize">end</property>
+            <property name="single-line-mode">1</property>
           </object>
         </child>
-        <child type="label_item"/>
       </object>
     </child>
   </template>